Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sun, 30 May 2010 11:55:39 +0000 (11:55 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sun, 30 May 2010 11:55:39 +0000 (11:55 +0000)
commitc6105db8fc5996e4e3d43c2c4c8b32af64532b67
treed8a0eb6f4a715b4b6d4577281922e4b40d97ce1c
parentc6bff60f0cca05cc56ff65a246b3f55ab3782cc3
parent52708ecb12947dfb4e9927e76bc1e11847e9fd21
Merge from mainline.